babl: simplify babl_format_with_space

Rely on any format string containing the substring "-space" that this
substring is the marker for the end of the encoding part of the format
name - which is what we want replicated in our new format with a different
color space.

diff --git a/babl/babl-format.c b/babl/babl-format.c
index e426feb21cda6b65d66a071bb5c6e8f2bda8a0a1..d2951657cf94a233bc23098a888460637fad2ed4 100644 (file)
--- a/babl/babl-format.c
+++ b/babl/babl-format.c
@@ -719,31 +719,21 @@ babl_format_with_space (const char *name, const Babl *space)
 
   if (BABL_IS_BABL (example_format))
   {
-    if (babl_format_get_space (example_format) == babl_space ("sRGB"))
-    {
-      name = babl_get_name (example_format); // the safest choice when getting sRGB based formats to cast
-    }
-    else
+    name = babl_get_name (example_format);
+    if (babl_format_get_space (example_format) != babl_space ("sRGB"))
     {
+      strcpy (&tmpname[0], name);
+
+      if (strstr (tmpname, "-space"))
+        *strstr (tmpname, "-space") = '\0';
+
       name = &tmpname[0];
-      if (example_format->format.components == babl_format_get_model (example_format)->model.components &&
-          (strstr (name, "CIE") || strstr (name, "cairo")))
-      {
-        // use the model name directly, for now CIE and cairo should catch most such issues
-        strcat (&tmpname[0], babl_get_name (babl_format_get_model (example_format)));
-      }
-      else
-      {
-        int i;
-        for (i = 0; i < example_format->format.components;i ++)
-          strcat (&tmpname[0], babl_get_name ((void*)example_format->format.component[i]));
-      }
-      strcat (&tmpname[0], " ");
-      strcat (&tmpname[0], babl_get_name ((void*)example_format->format.type[0]));
     }
   }
 
-  if (!space) space = babl_space ("sRGB");
+  if (!space)
+    space = babl_space ("sRGB");
+
   if (space->class_type == BABL_FORMAT)
   {
     space = space->format.space;